[IA64] cleanup

Cleanup: add static, remove unused code/variables/macros.
Simplifications.

Signed-off-by: Tristan Gingold <tristan.gingold@bull.net>

diff --git a/xen/arch/ia64/linux-xen/smp.c b/xen/arch/ia64/linux-xen/smp.c
index 7004ad4c9ed92807225091a6f7646c1c255315c3..026260dd9673770d26f415adb59ecf36bea2c0d4 100644 (file)
--- a/xen/arch/ia64/linux-xen/smp.c
+++ b/xen/arch/ia64/linux-xen/smp.c
@@ -57,7 +57,6 @@
 //Huh? This seems to be used on ia64 even if !CONFIG_SMP
 void flush_tlb_mask(cpumask_t mask)
 {
-#ifdef CONFIG_SMP
     int cpu;
 
     cpu = smp_processor_id();
@@ -66,6 +65,7 @@ void flush_tlb_mask(cpumask_t mask)
        local_flush_tlb_all ();
     }
 
+#ifdef CONFIG_SMP
     if (cpus_empty(mask))
         return;
 
@@ -93,14 +93,6 @@ void smp_send_event_check_mask(cpumask_t mask)
         if (cpu_isset(cpu, mask))
            platform_send_ipi(cpu, IA64_IPI_RESCHEDULE, IA64_IPI_DM_INT, 0);
 }
-
-
-//Huh? This seems to be used on ia64 even if !CONFIG_SMP
-int try_flush_tlb_mask(cpumask_t mask)
-{
-       dummy();
-       return 1;
-}
 #endif
 #endif
 

diff --git a/xen/arch/ia64/xen/domain.c b/xen/arch/ia64/xen/domain.c
index b218be10ebe084a516f4212fea61674ee748fbd6..7def6cb693add15a74b5fb4f778d2d510559d3d4 100644 (file)
--- a/xen/arch/ia64/xen/domain.c
+++ b/xen/arch/ia64/xen/domain.c
@@ -598,14 +598,13 @@ __assign_new_domain_page(struct domain *d, unsigned long mpaddr, pte_t* pte)
         p = mfn_to_page((mpaddr >> PAGE_SHIFT));
         return p;
     }
-    else
 #endif
-    {
-        p = alloc_domheap_page(d);
-        // zero out pages for security reasons
-        if (p)
-            clear_page(page_to_virt(p));
-    }
+
+    p = alloc_domheap_page(d);
+    // zero out pages for security reasons
+    if (p)
+        clear_page(page_to_virt(p));
+
     if (unlikely(!p)) {
         printf("assign_new_domain_page: Can't alloc!!!! Aaaargh!\n");
         return(p);

diff --git a/xen/arch/ia64/xen/regionreg.c b/xen/arch/ia64/xen/regionreg.c
index e7e9165794b431f1fead56813a6c761b80fd29b4..0febe0c394934f51d9af2d513cfffec88bfb919e 100644 (file)
--- a/xen/arch/ia64/xen/regionreg.c
+++ b/xen/arch/ia64/xen/regionreg.c
@@ -250,25 +250,6 @@ int set_one_rr(unsigned long rr, unsigned long val)
                return 0;
        }
 
-#if 0
-       memrrv.rrval = rrv.rrval;
-       if (rreg == 7) {
-               newrrv.rid = newrid;
-               newrrv.ve = VHPT_ENABLED_REGION_7;
-               newrrv.ps = IA64_GRANULE_SHIFT;
-               ia64_new_rr7(vmMangleRID(newrrv.rrval),v->vcpu_info,
-                               v->arch.privregs);
-       }
-       else {
-               newrrv.rid = newrid;
-               // FIXME? region 6 needs to be uncached for EFI to work
-               if (rreg == 6) newrrv.ve = VHPT_ENABLED_REGION_7;
-               else newrrv.ve = VHPT_ENABLED_REGION_0_TO_6;
-               newrrv.ps = PAGE_SHIFT;
-               if (rreg == 0) v->arch.metaphysical_saved_rr0 = newrrv.rrval;
-               set_rr(rr,newrrv.rrval);
-       }
-#else
        memrrv.rrval = rrv.rrval;
        newrrv.rid = newrid;
        newrrv.ve = 1;  // VHPT now enabled for region 7!!
@@ -285,7 +266,6 @@ int set_one_rr(unsigned long rr, unsigned long val)
        } else {
                set_rr(rr,newrrv.rrval);
        }
-#endif
        return 1;
 }
 

diff --git a/xen/arch/ia64/xen/xenmem.c b/xen/arch/ia64/xen/xenmem.c
index ec2b03641a0a6f04c034f6900826b50cb7bb3baf..ebdba3b19c8005e971f8a9a0576d2d17a023bc5c 100644 (file)
--- a/xen/arch/ia64/xen/xenmem.c
+++ b/xen/arch/ia64/xen/xenmem.c
@@ -100,7 +100,7 @@ alloc_table_page(unsigned long fill)
        return mfn;
 }
 
-int
+static int
 create_frametable_page_table (u64 start, u64 end, void *arg)
 {
        unsigned long address, start_page, end_page;
@@ -136,7 +136,7 @@ create_frametable_page_table (u64 start, u64 end, void *arg)
        return 0;
 }
 
-int
+static int
 create_mpttable_page_table (u64 start, u64 end, void *arg)
 {
        unsigned long address, start_page, end_page;

diff --git a/xen/arch/ia64/xen/xenmisc.c b/xen/arch/ia64/xen/xenmisc.c
index 7c2a9e715e77e54b9749ef97350994635675c77e..aef50a48d2afc0ab8b8a27b6e9fd9eef7933c0c1 100644 (file)
--- a/xen/arch/ia64/xen/xenmisc.c
+++ b/xen/arch/ia64/xen/xenmisc.c
@@ -69,21 +69,19 @@ struct pt_regs *guest_cpu_user_regs(void) { return vcpu_regs(current); }
 unsigned long
 gmfn_to_mfn_foreign(struct domain *d, unsigned long gpfn)
 {
+       unsigned long pte;
+
 #ifndef CONFIG_XEN_IA64_DOM0_VP
        if (d == dom0)
                return(gpfn);
-       else
 #endif
-       {
-               unsigned long pte = lookup_domain_mpa(d,gpfn << PAGE_SHIFT);
-               if (!pte) {
-printk("gmfn_to_mfn_foreign: bad gpfn. spinning...\n");
-while(1);
-                       return 0;
-               }
-               return ((pte & _PFN_MASK) >> PAGE_SHIFT);
+       pte = lookup_domain_mpa(d,gpfn << PAGE_SHIFT);
+       if (!pte) {
+               panic("gmfn_to_mfn_foreign: bad gpfn. spinning...\n");
        }
+       return ((pte & _PFN_MASK) >> PAGE_SHIFT);
 }
+
 #if 0
 u32
 mfn_to_gmfn(struct domain *d, unsigned long frame)
@@ -97,13 +95,6 @@ while(1);
 }
 #endif
 
-///////////////////////////////
-// from arch/x86/flushtlb.c
-///////////////////////////////
-
-u32 tlbflush_clock;
-u32 tlbflush_time[NR_CPUS];
-
 ///////////////////////////////
 // from arch/x86/memory.c
 ///////////////////////////////
@@ -287,8 +278,8 @@ void context_switch(struct vcpu *prev, struct vcpu *next)
 static long cnt[16] = { 50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50};
 static int i = 100;
 int id = ((struct vcpu *)current)->domain->domain_id & 0xf;
-if (!cnt[id]--) { printk("%x",id); cnt[id] = 500000; }
-if (!i--) { printk("+"); i = 1000000; }
+if (!cnt[id]--) { cnt[id] = 500000; printk("%x",id); }
+if (!i--) { i = 1000000; printk("+"); }
 }
 
     if (VMX_DOMAIN(current)){

diff --git a/xen/include/asm-ia64/flushtlb.h b/xen/include/asm-ia64/flushtlb.h
index d0c3286448e2a6614ab5ec448d75c1c1009b8113..98a794b0cc73e492fba2216b5de513af247ac1e3 100644 (file)
--- a/xen/include/asm-ia64/flushtlb.h
+++ b/xen/include/asm-ia64/flushtlb.h
@@ -3,14 +3,7 @@
 
 #include <asm/tlbflush.h>
 
-/* The current time as shown by the virtual TLB clock. */
-extern u32 tlbflush_clock;
-
-/* Time at which each CPU's TLB was last flushed. */
-extern u32 tlbflush_time[NR_CPUS];
-
-#define tlbflush_current_time() tlbflush_clock
+#define tlbflush_current_time() 0
 #define tlbflush_filter(x,y) ((void)0)
-#define NEED_FLUSH(x, y) (0)
 
 #endif

diff --git a/xen/include/asm-ia64/vhpt.h b/xen/include/asm-ia64/vhpt.h
index 9253a47701905c4d93b6c381ca11d9a3bbc9c3a6..fc7437d220693d1ca2278923a1fc72fd392db72a 100644 (file)
--- a/xen/include/asm-ia64/vhpt.h
+++ b/xen/include/asm-ia64/vhpt.h
@@ -2,8 +2,6 @@
 #define ASM_VHPT_H
 
 #define VHPT_ENABLED 1
-#define VHPT_ENABLED_REGION_0_TO_6 1
-#define VHPT_ENABLED_REGION_7 0
 
 /* Size of the VHPT.  */
 #define        VHPT_SIZE_LOG2                  24